Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace the esoteric term 'datum' when describing dict comprehensions #106119

Merged
merged 1 commit into from
Jul 3, 2023
Merged

Replace the esoteric term 'datum' when describing dict comprehensions #106119

merged 1 commit into from
Jul 3, 2023

Conversation

nedbat
Copy link
Member

@nedbat nedbat commented Jun 26, 2023 •
edited by github-actions bot
Loading

@bedevere-bot bedevere-bot added awaiting review docs Documentation in the Doc dir skip news labels Jun 26, 2023
@SnoopJ
Copy link
Contributor

SnoopJ commented Jun 26, 2023 •
edited
Loading

This PR originates from an IRC discussion in #python on Libera.chat wherein a user was confused about the mix-and-match usage of key/value and key/datum in the official documentation.

Also worth considering as a potentially confusing ambiguity: there are several places in the docs that use the expression key value when referring to an object that is being used as a key.

Edit: Fun trivia: this language dates to the 1991 draft of the Language Reference, the term first appeared in f2612d1 by my reckoning.

JelleZijlstra
JelleZijlstra approved these changes Jun 26, 2023
View reviewed changes
Copy link
Member

@JelleZijlstra JelleZijlstra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks. "datum" is unnecessarily obscure.

I'll leave this open for some time in case others have comments.

@JelleZijlstra JelleZijlstra added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes and removed awaiting merge labels Jun 26, 2023
@JelleZijlstra JelleZijlstra self-assigned this Jun 26, 2023
@nedbat nedbat force-pushed the nedbat/no-key-datum branch from dbc8951 to 979f6f8 Compare July 3, 2023 01:37
@nedbat
Copy link
Member Author

nedbat commented Jul 3, 2023

@JelleZijlstra thoughts?

@JelleZijlstra JelleZijlstra merged commit 987b712 into python:main Jul 3, 2023
@miss-islington
Copy link
Contributor

Thanks @nedbat for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 3, 2023
@nedbat @miss-islington
Replace the esoteric term 'datum' when describing dict comprehensions (…
7940e32 
…pythonGH-106119)

(cherry picked from commit 987b712)

Co-authored-by: Ned Batchelder <[email protected]>
@bedevere-bot
Copy link

GH-106348 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jul 3, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 3, 2023
@nedbat @miss-islington
Replace the esoteric term 'datum' when describing dict comprehensions (…
6cccbea 
…pythonGH-106119)

(cherry picked from commit 987b712)

Co-authored-by: Ned Batchelder <[email protected]>
@bedevere-bot
Copy link

GH-106349 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 3, 2023
JelleZijlstra pushed a commit that referenced this pull request Jul 3, 2023
@miss-islington @nedbat
[3.12] Replace the esoteric term 'datum' when describing dict compreh…
5e85604 
…ensions (GH-106119) (#106348)

Replace the esoteric term 'datum' when describing dict comprehensions (GH-106119)
(cherry picked from commit 987b712)

Co-authored-by: Ned Batchelder <[email protected]>
JelleZijlstra pushed a commit that referenced this pull request Jul 3, 2023
@miss-islington @nedbat
[3.11] Replace the esoteric term 'datum' when describing dict compreh…
e0d951d 
…ensions (GH-106119) (#106349)

Replace the esoteric term 'datum' when describing dict comprehensions (GH-106119)
(cherry picked from commit 987b712)

Co-authored-by: Ned Batchelder <[email protected]>
carljm added a commit to carljm/cpython that referenced this pull request Jul 3, 2023
@carljm
Merge branch 'main' into modulelocals
ac11740 
* main: (167 commits)
  pythongh-91053: make func watcher tests resilient to other func watchers (python#106286)
  pythongh-104050: Add more type hints to Argument Clinic DSLParser() (python#106354)
  pythongh-106359: Fix corner case bugs in Argument Clinic converter parser (python#106361)
  pythongh-104146: Remove unused attr 'parameter_indent' from clinic.DLParser (python#106358)
  pythongh-106320: Remove private _PyErr C API functions (python#106356)
  pythongh-104050: Annotate Argument Clinic DSLParser attributes (python#106357)
  pythongh-106320: Create pycore_modsupport.h header file (python#106355)
  pythongh-106320: Move _PyUnicodeWriter to the internal C API (python#106342)
  pythongh-61215: New mock to wait for multi-threaded events to happen (python#16094)
  Document PYTHONSAFEPATH along side -P (python#106122)
  Replace the esoteric term 'datum' when describing dict comprehensions (python#106119)
  pythongh-104050: Add more type hints to Argument Clinic DSLParser() (python#106343)
  pythongh-106320: _testcapi avoids private _PyUnicode_EqualToASCIIString() (python#106341)
  pythongh-106320: Add pycore_complexobject.h header file (python#106339)
  pythongh-106078: Move DecimalException to _decimal state (python#106301)
  pythongh-106320: Use _PyInterpreterState_GET() (python#106336)
  pythongh-106320: Remove private _PyInterpreterState functions (python#106335)
  pythongh-104922: Doc: add note about PY_SSIZE_T_CLEAN (python#106314)
  pythongh-106217: Truncate the issue body size of `new-bugs-announce-notifier` (python#106329)
  pythongh-104922: remove PY_SSIZE_T_CLEAN (python#106315)
  ...
@nedbat nedbat deleted the nedbat/no-key-datum branch July 3, 2023 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes

Assignees

@JelleZijlstra JelleZijlstra

Labels
docs Documentation in the Doc dir skip issue skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nedbat @SnoopJ @miss-islington @bedevere-bot @JelleZijlstra